x86: merge final linking scripts
authorKeir Fraser <keir.fraser@citrix.com>
Mon, 13 Jul 2009 10:51:07 +0000 (11:51 +0100)
committerKeir Fraser <keir.fraser@citrix.com>
Mon, 13 Jul 2009 10:51:07 +0000 (11:51 +0100)
commite1b075eaf13283dd695d33fb53d63fabd9067d4f
tree694621991aedacd99993b6955af30a436351aa4f
parent716ffa3e1d7abb7570fa10e04fd05bc41c3734af
x86: merge final linking scripts

While unrelated to the previous four patches, I realized that the two
scripts are nearly identical when coding those earlier patches, and
this patch depends on them in order to apply cleanly.

As an extra measure, it also adjusts the (unused) space freed at the
end of the per-CPU area to include all alignment space needed before
the first actual constituent of the .bss section (up to 7 pages on
x86-64).

Signed-off-by: Jan Beulich <jbeulich@novell.com>
xen/arch/x86/Makefile
xen/arch/x86/setup.c
xen/arch/x86/x86_32/xen.lds.S [deleted file]
xen/arch/x86/x86_64/xen.lds.S [deleted file]
xen/arch/x86/xen.lds.S [new file with mode: 0644]